Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Wed, 14 Jan 2015 16:00:38 +0000 (11:00 -0500)
committerTom Rini <[email protected]>
Wed, 14 Jan 2015 16:00:38 +0000 (11:00 -0500)
Conflicts:
tools/buildman/control.py

Signed-off-by: Tom Rini <[email protected]>

Trivial merge